Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MariaDB 11.7.1-rc releases #17966

Merged
merged 1 commit into from
Nov 25, 2024
Merged

Conversation

grooverdan
Copy link
Contributor

Got them right finally :-)

@grooverdan grooverdan requested a review from a team as a code owner November 24, 2024 22:15
Copy link

Diff for b00b516:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index bedda09..bb241c3 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -51,3 +51,13 @@ Tags: 11.6.2-ubi9, 11.6-ubi9, 11-ubi9, 11.6.2-ubi, 11.6-ubi, 11-ubi
 Architectures: amd64, arm64v8, ppc64le, s390x
 GitCommit: 292b81d08eaab23d8bd501171e570ea0636b0b82
 Directory: 11.6-ubi
+
+Tags: 11.7.1-noble-rc, 11.7-noble-rc, 11.7.1-rc, 11.7-rc
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: a6b360fc45b1a8fcd63b87ab69d4ce43566a7c06
+Directory: 11.7
+
+Tags: 11.7.1-ubi9-rc, 11.7-ubi9-rc, 11.7.1-ubi-rc, 11.7-ubi-rc
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: a6b360fc45b1a8fcd63b87ab69d4ce43566a7c06
+Directory: 11.7-ubi
diff --git a/_bashbrew-list b/_bashbrew-list
index 7d6f552..7565694 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -46,6 +46,14 @@ mariadb:11.6.2
 mariadb:11.6.2-noble
 mariadb:11.6.2-ubi
 mariadb:11.6.2-ubi9
+mariadb:11.7-noble-rc
+mariadb:11.7-rc
+mariadb:11.7-ubi9-rc
+mariadb:11.7-ubi-rc
+mariadb:11.7.1-noble-rc
+mariadb:11.7.1-rc
+mariadb:11.7.1-ubi9-rc
+mariadb:11.7.1-ubi-rc
 mariadb:latest
 mariadb:lts
 mariadb:lts-noble
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index bfc78be..67afac5 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -5,6 +5,8 @@ mariadb:10.6
 mariadb:10.6-ubi
 mariadb:11-ubi
 mariadb:11.2
+mariadb:11.7-rc
+mariadb:11.7-ubi-rc
 mariadb:latest
 mariadb:lts
 mariadb:lts-ubi
diff --git a/mariadb_latest/Dockerfile b/mariadb_11.7-rc/Dockerfile
similarity index 97%
copy from mariadb_latest/Dockerfile
copy to mariadb_11.7-rc/Dockerfile
index 4986cf7..246b977 100644
--- a/mariadb_latest/Dockerfile
+++ b/mariadb_11.7-rc/Dockerfile
@@ -75,18 +75,18 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
       org.opencontainers.image.licenses="GPL-2.0" \
       org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \
       org.opencontainers.image.vendor="MariaDB Community" \
-      org.opencontainers.image.version="11.6.2" \
+      org.opencontainers.image.version="11.7.1" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=1:11.6.2+maria~ubu2404
+ARG MARIADB_VERSION=1:11.7.1+maria~ubu2404
 ENV MARIADB_VERSION $MARIADB_VERSION
-# release-status:Stable
+# release-status:RC
 # release-support-type:Short Term Support
 # (https://downloads.mariadb.org/rest-api/mariadb/)
 
 # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions
-ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.6.2/repo/ubuntu/ noble main main/debug"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.7.1/repo/ubuntu/ noble main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
diff --git a/mariadb_latest/docker-entrypoint.sh b/mariadb_11.7-rc/docker-entrypoint.sh
similarity index 99%
copy from mariadb_latest/docker-entrypoint.sh
copy to mariadb_11.7-rc/docker-entrypoint.sh
index 36f54d6..92d280c 100755
--- a/mariadb_latest/docker-entrypoint.sh
+++ b/mariadb_11.7-rc/docker-entrypoint.sh
@@ -225,7 +225,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-	echo -n "11.6.2-MariaDB"
+	echo -n "11.7.1-MariaDB"
 }
 
 # initializes the database directory
diff --git a/mariadb_11-ubi/healthcheck.sh b/mariadb_11.7-rc/healthcheck.sh
similarity index 100%
copy from mariadb_11-ubi/healthcheck.sh
copy to mariadb_11.7-rc/healthcheck.sh
diff --git a/mariadb_11-ubi/Dockerfile b/mariadb_11.7-ubi-rc/Dockerfile
similarity index 97%
copy from mariadb_11-ubi/Dockerfile
copy to mariadb_11.7-ubi-rc/Dockerfile
index 8bf1dec..572ff0d 100644
--- a/mariadb_11-ubi/Dockerfile
+++ b/mariadb_11.7-ubi-rc/Dockerfile
@@ -36,7 +36,7 @@ COPY MariaDB.repo /etc/yum.repos.d/
 # https://access.redhat.com/documentation/en-us/red_hat_software_certification/2024/html/red_hat_openshift_software_certification_policy_guide/assembly-requirements-for-container-images_openshift-sw-cert-policy-introduction#con-image-metadata-requirements_openshift-sw-cert-policy-container-images
 LABEL name="MariaDB Server" \
 	vendor="MariaDB Community" \
-	version="11.6.2" \
+	version="11.7.1" \
 	release="Refer to Annotations org.opencontainers.image.{revision,source}" \
 	summary="MariaDB Database" \
 	description="MariaDB Database for relational SQL"
@@ -50,13 +50,13 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
       org.opencontainers.image.licenses="GPL-2.0" \
       org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \
       org.opencontainers.image.vendor="MariaDB Community" \
-      org.opencontainers.image.version="11.6.2" \
+      org.opencontainers.image.version="11.7.1" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=11.6.2
+ARG MARIADB_VERSION=11.7.1
 ENV MARIADB_VERSION=$MARIADB_VERSION
-# release-status:Stable
+# release-status:RC
 # release-support-type:Short Term Support
 # (https://downloads.mariadb.org/rest-api/mariadb/)
 
diff --git a/mariadb_11-ubi/MariaDB.repo b/mariadb_11.7-ubi-rc/MariaDB.repo
similarity index 53%
copy from mariadb_11-ubi/MariaDB.repo
copy to mariadb_11.7-ubi-rc/MariaDB.repo
index d9223c3..fe521d5 100644
--- a/mariadb_11-ubi/MariaDB.repo
+++ b/mariadb_11.7-ubi-rc/MariaDB.repo
@@ -1,7 +1,7 @@
 [mariadb]
 name = MariaDB
-#baseurl = https://rpm.mariadb.org/11.6/rhel/$releasever/$basearch
-baseurl = https://archive.mariadb.org/mariadb-11.6/yum/rhel/$releasever/$basearch
+#baseurl = https://rpm.mariadb.org/11.7/rhel/$releasever/$basearch
+baseurl = https://archive.mariadb.org/mariadb-11.7/yum/rhel/$releasever/$basearch
 #microdnf cannot read to the second key here.
 #gpgkey=https://archive.mariadb.org/PublicKey
 gpgcheck=1
diff --git a/mariadb_latest/docker-entrypoint.sh b/mariadb_11.7-ubi-rc/docker-entrypoint.sh
similarity index 99%
copy from mariadb_latest/docker-entrypoint.sh
copy to mariadb_11.7-ubi-rc/docker-entrypoint.sh
index 36f54d6..92d280c 100755
--- a/mariadb_latest/docker-entrypoint.sh
+++ b/mariadb_11.7-ubi-rc/docker-entrypoint.sh
@@ -225,7 +225,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-	echo -n "11.6.2-MariaDB"
+	echo -n "11.7.1-MariaDB"
 }
 
 # initializes the database directory
diff --git a/mariadb_11-ubi/docker.cnf b/mariadb_11.7-ubi-rc/docker.cnf
similarity index 100%
copy from mariadb_11-ubi/docker.cnf
copy to mariadb_11.7-ubi-rc/docker.cnf
diff --git a/mariadb_11-ubi/healthcheck.sh b/mariadb_11.7-ubi-rc/healthcheck.sh
similarity index 100%
copy from mariadb_11-ubi/healthcheck.sh
copy to mariadb_11.7-ubi-rc/healthcheck.sh

Relevant Maintainers:

@yosifkit yosifkit merged commit 35680b4 into docker-library:master Nov 25, 2024
17 checks passed
@grooverdan grooverdan deleted the 2024_q4_part2a branch November 25, 2024 20:30
@grooverdan
Copy link
Contributor Author

Thanks @yosifkit !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants